Revert bbd9804..b3741a1

This rolls back to commit bbd98040531508cf1870f8005418303aea72d132.