K 10 svn:author V 3 ken K 8 svn:date V 27 2012-07-17T22:16:10.891835Z K 7 svn:log V 213 Add back spare fields consumed in r237545. It seems that these should only be consumed to maintain backward compatibility in stable, but should not be consumed in head. Submitted by: trasz, attilio (indirectly) END