Fix Win32 builds and remove the new MAC address editing prompt.
Merge pull request #6577 from thedax/win32-buildfix

Win32 buildfix. Remove the new MAC address editing prompt, too.