Reverting the earlier commit for TOOLS-2497