Revert 7e48303..e55d6c2

This rolls back to commit 7e483034488a55acf0e47007b531c4e8940e6af4.