r20591: Revert accidental commit that broke the build.