Set surface class name patch was integrated upstream.