Revert 326925b..a7e82fb

This rolls back to commit 326925b2dcac975cda8e4168d6f72c4cbcc748c7.