Follow-up from "Ignore value of feature toggle for policy scope"

The following discussion from !146086 (merged) should be addressed: