This fixes a functional change in 4db2a08281, which was marked as 'should have non-functional changes only'.
4db2a08281