Adopt change 2.S2 proposed by the GLD WG in #254.