Change -map: to not create an extra RACLiveSubscriber

Depends on #1376.

Cannot be merged until #1375 is fixed as it will trigger very often.