Reverted change to scanner that I accidently commited while fixing a merge conflict. (should be fixed anyway, but not here, to prevent merge conflicts later etc)