This reverts commit 3f0ce125. I didn't mean to commit it yet (it needs cleanups, at least), and it breaks compilation for someone. CCBUG: 203554