Backout 9bd33c91a3e5 (bug 906466) because it will make win32 ux updates worse