Revert b7e7055..4caa9c6

This rolls back to commit b7e7055b3feaec5c6a0029e3a96e09e5954d630b.