Revert e24c4c3..139634b

This rolls back to commit e24c4c39a9be2a69294aea621c9d1408fcd8fa1c.