Fix broken scans due to bad merge.
Merge branch 'hotfix/broken_scans'