Revert 603474a..bccc241

This rolls back to commit 603474a4687593de84d0df8c9db2baa3a23d5707.