Backed out changeset b88172246b66 due to Win32 debug failures.