Simple re-wiring

@ 67dart273 I'm not really worried about the restore correct factor so running through the bulkhead or getting rid of it sounds appealing since I just read they have tendency to melt.