Revert 081006e..419ed0c

This rolls back to commit 081006e67e9e8bfff4a44d479bec13c219714ec1.