Reverting the last changes, they are incompatible with PHOS and EMCAL Getters