Replace accidentally removed code