revert some changes in main_scheck

Test Plan: make test

Reviewers: pad

Differential Revision: https://phabricator.fb.com/D927302
Merge branch 'master' of github.com:facebook/pfff