Workaround for TOOLS-223