Revert my previous check-in that split up MachineModuleInfo. It turns out to