Revert 82a1387..097eb70

This rolls back to commit 82a13871f1ac9fe6e4c32608d681b775f9b87b37.