Fix #2013 RemoteManager being coupled to Application
Merge pull request #2078 from Anahkiasen/coupled-remote

Fix #2013 RemoteManager being coupled to Application