Match s/// return value to spec commit eca5f2fdf.