Revert 404358d..e4a972a

This rolls back to commit 404358dd0e754cccbfa08b48264946902524ca41.