msc: Handle machine removal from pull_mode

Refs #2248