Remove old unnecessary hack from upgrade script