Revert dc4b2aa..c12a5b4

This rolls back to commit dc4b2aa7eeb157f1cf33e06a5df42b3836de0e5d.