[Bug 214420] Breaks compatibility