Track upstream changeset 1407.