Revert b3a356d..32bdf01

This rolls back to commit b3a356df57c5e27851a8b5912aa76705113eb34e.