Revert "Revert "Revert "Revert "RemoteTool""""

This reverts commit 515929162bafd998e854ff0b8e5a80a2afe6dee4.