Reinstate PlotSurface2D for now