Revert ade7d8a..8079183

This rolls back to commit ade7d8ae51224119ce6d8ff612b5aa3b98d44f5c.