S000: Fun with coincident surfaces

Change-Id: I6ccf9b711c3006eef6d95af92e585509956202d2