Revert 7910121..c2ffa16

This rolls back to commit 7910121768abc10433982ba96b5b6c8b2ba6f2e8.