Revert b5238bf..84f7890

This rolls back to commit b5238bf02f00dc5d2eee443146acfe64bf53fbf8.