The previous code was copy paste from the old scan and it did not respect
the new scan internals.