Reverting fix for TOOLS-2526