fix mis-application of patch to 3.x, RT#28526