Revert dcc0a83..70cfb6e

This rolls back to commit dcc0a83e9368fde4d7bfaa658e10a7ccd092ad2f.