Revert "Merge pull request #4406 from wavewave/proot"

This reverts commit 552d1ec8b36515c3de5d660815a521353419bae6, reversing
changes made to 3432414808afa5bdb2019f165365f5b6ff46cf2f.