Backout of 28d43f4.

Not quite ready for primetime.