Revert a75a6ea..935449f

This rolls back to commit a75a6ea87e16c0a0e6f705333474c868dce311ff.