Revert e9b5923..157b6b9

This rolls back to commit e9b59235ec826fe6ed00dd734d20581003031987.