Revert "Apply surface patch"

This reverts commit 3609665e1b412b78373c021c28b48291fc10084b.