Revert a57a07a..aaf8f68

This rolls back to commit a57a07afe8d0cb059fe826754dd7a7cd18b947a4.