Revert changeset 31196 -- the corresponding preprocessed headers has never been regenerated since the change and therefore it has never been properly tested