Temporary workaround for #777 while we investigate googlesource.com