NACK on renaming-- that will just cause us headaches merging upstream changes.

Empty rule (with a comment-- we can add a comment, right?) sounds like the correct fix.