Revert c5ccf8d..d74ce40

This rolls back to commit c5ccf8d5f40a894c7fd397a50caad17b4208df70.