Revert 21435be..c2b5630

This rolls back to commit 21435be3be86acf2477750b6114ce3ff8c38faa9.