Revert r107773 - increases parsercache fragmentation without clear benefit