Revert e67f8ab..c2e5a26

This rolls back to commit e67f8ab294a7d5aab09c41039aad829cad00eee4.