Revert "Changed scan method"

This reverts commit 01afda7e18b44239d98b0a30bc4be48ca3015ee4.