Revert cc7a797..e4904b2

This rolls back to commit cc7a7976277f140d5dcea91f55b9d59da6bbc3c5.