Revert e9b5923..0ee0fe7

This rolls back to commit e9b59235ec826fe6ed00dd734d20581003031987.