Revert to old surface scan function as new one was flawed and it hurts

Revert to old surface scan function as new one was flawed and it hurts #486