Some of our custom rules have been upstreamed[0], update the rule sets accordingly.
[0] gjs!272 (merged)