Bring back accidentally removed code