Revert cb8b512..05e487a

This rolls back to commit cb8b512b6bd947b53f0b0dc2673ede013de29f17.