Revert e6e2ae4..ec27124

This rolls back to commit e6e2ae4695417a0ced4b00c4e34f12aef7373a2d.