Revert b90a2a6..5f502db

This rolls back to commit b90a2a69d591730d1cc4993b2c311bb0d82dd1e3.