JAL-2154 patch the hack (Jalview2XML tests pass)