CON-1016: Restore accidentally removed code