Apply patch from Sohani for TOOLS-2358.