Applying a patch from Paraparan for fixing TOOLS-2426.