Revert 2d7b907..1a530a5

This rolls back to commit 2d7b907ef5b767e3ff3a2f9d7ac5fdcf2a2ed001.