Revert "Merge remote-tracking branch 'refs/remotes/origin/pm2waySync'"

This reverts commit 6f9713cc79d155a18da24f65e6d86dd5e452f2d4, reversing
changes made to 8933779e72160e316f36a8830c9c619cbe07c4a1.