Revert 4016873..4560617

This rolls back to commit 40168733ce9f14d346d5657386d0e96f91b72da9.