Workaround issue 10031 on testate branch.