Revert 0652d77..5665074

This rolls back to commit 0652d77f5d5e033318f8a13f1c46888a1d2e1096.