HAL-337: Partly undo fix which was introduced by HAL-10