Revert 64954e6..6aa97ee

This rolls back to commit 64954e6f51d8e836125911f585624993c6185b35.