I picked up a cheap harness from Amazon with the intent to repin the replacement 7-pin trailer connector into the OEM harness, but the trailer connectors are different, and I couldn't figure out how to pull the pins from the OEM trailer connector anyway.
So, I ended up cutting the OEM "Deutsch"...