Revert d207378..f3f1150

This rolls back to commit d2073789be5c8b0c0882ef831e31fd6ee0ea9066.