Back out 997672af6fc8:8a34b197be1d (bug 885169) for Win64 bustage