Revert 4dbe01f..92a065c

This rolls back to commit 4dbe01f49cd3fbf8feabd6b3fd61c97c7922d372.