Workaround Bug 1029500 for #93