Restore fix for HAL-266