Roll back to 3a24e46e15.

And begin trek toward drawing board.