Revert 6011723..b7622cc

This rolls back to commit 60117232a4a535d4961136bd7db4752900644e2d.