Fixed compatibility form conflict (bug 1055513)

See bug for all the details.
:+1: