Revert 35a0807..e33ba37

This rolls back to commit 35a0807aa1853a52aeca0989ca8e3f666b84d734.