Backed out changeset 893b864b4b18 (bug 969012) for causing bug 984653.