Revert "Work towards fixing the "do-not-update-to-rcs" self-test."

This reverts commit 89b394d9744a6b6399b469c2801dee73264f4626.

I cherry-picked the change onto devel, since this change isn't
even supposed to change the behavior of the tool. Why risk
it just before the release? Thanks @nim for the suggestion.