Revert 7af5bed..1e8294c

This rolls back to commit 7af5bed18b2694ad094615fca1a4d857475f9b82.