This reverts commit 8ee1ef2a. This breaks an update_cc_test_checks test that is based on an incorrect %S use, revert until I can fix it.