R1:f6fbe40bd5f6

Minor, completely remove references to PHID from schema patches so upgrade-from-scratch works.