Revert 32bc709..d4b99d2

This rolls back to commit 32bc7092af484a2bdfba1746f373bb01aaa881fd.