Revert ae75f35..6bf4dae

This rolls back to commit ae75f35f080d953b9fc8d040e74606236377985f.