Backing out bug 893276 for causing bug 1058840.