Revert 0916322..0902515

This rolls back to commit 091632200ca5e3c7571429c0b7d6c2d0d07bd401.