Revert 3fd36d7..bb0d253

This rolls back to commit 3fd36d7d1a081e1fd3196edd00e8d8016dee921c.