Revert "Remove unneeded code which causes performance issues"
Revert "Remove unneeded code which causes performance issues"

This reverts commit 5dff8e12e850e6eadf897d4adc753b928a3e5d28.

P2Pvalue/teem,P2Pvalue/pear2pear,P2Pvalue/pear2pear,Grasia/teem,P2Pvalue/teem,P2Pvalue/teem,Grasia/teem,Grasia/teem