Backed out changeset b097bd9fd24c because of Windows build bustage