This has been refactored since I wrote the TODO over a year ago

Also make the command missing execution get skipped on windows,
this still needs to be skipped on ARM per #3576