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