Let's apply this to 5.4 only for now. We can backport later if there's strong need for it, but we should default to being conservative.