Revert 64c1e9d..57da4bf

This rolls back to commit 64c1e9db8922d682ecd6620d33e59b356f3ce564.