Fixed compatibility form conflict (bug 1055513)

See bug for all the details.
Is this meant to be indented so much?