Where does this come from? Thought this patch was about removing waffle flags.