Restored the moonshot VM configuration, retaining the upstream version in comments