b=966322 work around bug 916387 DONTBUILD

--HG--
extra : rebase_source : 8c99076c2fdcf1f94eeaab085cc898346d189a1a