backout Bug 891882 for Gu breakage