Revert e8bed8f..5117c58

This rolls back to commit e8bed8fb6eccde4040958ba1633b1beb645e6c76.