Revert b525694..0e4e389

This rolls back to commit b52569451d6a811cd3cea92c1e86ebe45ea2d3a7.