This partially reverts commit a60dd069 ("Fix a few places that could create duplicate root applied rules").