Reconciling EFT and hybrid calculations of the light MSSM Higgs-boson mass