But don't break 3.x compatibility