This reverts commit 58ea00b5. Test for .o + .ifs sidecar files is brittle and failing on bots. Reverting to unblock.