Restore the frozen v5/hgcal.xml and add the scenario for HGHEBack-less in Configuration