Revert 274d445..07132c9

This rolls back to commit 274d4458b945ee93b89425f60450494d21d22952.