Revert "Volkan's assumption might hold for smooth surfaces"
This reverts commit 8f3f8781ec8655f482432cc983f8cccda5609940.