fix mis-application of mis-application merge? wtf? 32250