Revert b9eb7c8..f7f7c52

This rolls back to commit b9eb7c84495434d922ee08782883a6ad323d2cbb.