Revert e9815ad..de9d6b9

This rolls back to commit e9815ad6ba2afeee7e9e8715a568bff1e6d5a2a6.