Revert 5b46f3b..12dd6cf

This rolls back to commit 5b46f3b331042f62d4b691d5f6e5c5a9be748b93.