Use the scripted version.

Cleaning up the old surface