Bug 1005847 - Backout skip e7256e0270ee