Error with citext extension when upgrading from 9.0.3 to 9.3.5: 'cannot cast type oid[] to oidvector'

Dear PostgreSQL developers,

We've encountered some errors when upgrading a database using the citext
extension from 9.0.3 to 9.3.5. Specifically, we run pg_upgrade, then
attempt to run 'CREATE EXTENSION citext FROM UNPACKAGED' to resolve
collation errors on our citext columns. This produces the error message
'ERROR: cannot cast type oid[] to oidvector' when it runs the following
command from contrib/citext/citext--unpackaged--1.0.sql:

UPDATE pg_catalog.pg_index SET indcollation[0] = 100
WHERE indclass[0] IN (
WITH RECURSIVE typeoids(typoid) AS
( SELECT 'citext'::pg_catalog.regtype UNION
SELECT oid FROM pg_catalog.pg_type, typeoids
WHERE typelem = typoid OR typbasetype = typoid )
SELECT oid FROM pg_catalog.pg_opclass, typeoids
WHERE opcintype = typeoids.typoid
);

We think this may be related to commit 7b63528, which fixes array slicing
of int2vector and oidvector values. The full message on the commit states
that this forbids array-element updates on oidvector columns. Additionally,
we have successfully upgraded to 9.3.1, which is the latest version of 9.3
that does not include this commit.

Please let us know if there's additional information or assistance we can
provide to help resolve this.

Thanks very much,
Eric Malm and Luan Santos, for the Pivotal CF Runtime team