Added back support for non mira machines.