Revert r161371. Removing the 'const' before Type is a "good thing".