Merge change I11fbdf50

* changes:
  Remove check for surface valid that is no longer valid.