Revert ddf885d..ac6a857

This rolls back to commit ddf885d356af64f7d1404dc7786e343005ee0d81.