Revert e806c58..fff80af

This rolls back to commit e806c58a1ee556a896c626f010069005fcb38610.