Revert db10452..6d9a2c5

This rolls back to commit db10452bfed4349d0287203526144640933745e6.