Revert e24dd05..b45543e

This rolls back to commit e24dd050fa42b840ea838f9f7a9dbb04756bb1e8.