Refactor #3370: Reverse change to FixedWidth and FixedHeight policy