Revert b0ddec5..80d5702

This rolls back to commit b0ddec5fc5e5acdbd16b56526719f61ad7553f36.