Revert "avoid unnecesary call to onLoad"
Revert "avoid unnecesary call to onLoad"

This reverts commit 5a81300cb8a99c7428d9aeea26276d4415efcf64.

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