Revert revision 48644.
It contains so many formatting changes to as make porting things to Python impossible. I'll cherry-pick the todo and non-formatting changes soonish.