Revert d8e752a..a751e89

This rolls back to commit d8e752a582f3b3649eaf9b64c973fc2795282a54.