[8] RFR: Revert leftover changes in type.{cpp|hpp}

[Roman Kennke]

>> How's that working in later versions?
> 
> See the code comment. Later fixes changed it to the same thing we have. But we cannot risk it in 8u.


Ok, great. Go!

Roman