Revert ef62af2..5046b2c

This rolls back to commit ef62af2e10542bd7f5078604379a081385735e0a.