Backout commit 46ff72c744b643df25898d10400f778f24897a74