Moved patch for PG9.1 to where omnibus build now seems to expect it