Apply patch from Sohani for TOOLS-2292.
Revert "Apply patch from Sohani for TOOLS-2292."

This reverts commit 7632abf1da46b500e380fcad45d2c9ab33237f44.
Apply patch from Sohani for TOOLS-2292.