98e24b0d.  This was fixed completely in commit af19cb55,
but in any case this code shouldn't be needed anymore.