Revert 7b35abe..a837bad

This rolls back to commit 7b35abe23f61074a246c0534d1d7e41af18bd74d.