Revert 4eab15f..f83f57f

This rolls back to commit 4eab15fe4fbec4b7436290523ab105ac1e3b4941.