This reverts commit f75bb7c337. We need to figure out all those warnings before reapplying this patch.
f75bb7c337