Too soon to drop backwards compatibility