Revert Merge "Bug 2366: new parser - Types & TypeDefs"