The x86 logic might be overkill since right now x86 Windows images already have it installed, but figured might as well support it just in case. Closes #143