Revert ed88323..8782c19

This rolls back to commit ed883232912dcb4165f1fd6fcf2dfee17795053f.