Revert surround bindings to S