Work around itstool bug, #715116