Enable workaround Google bug 10194508