Clean up 9.3+ service patching.
Clean up 9.3+ service patching.

Traiver/FBI,Jerry-Shaw/FBI,masterhou/FBI,leo60228/CTRM,Possum/LumaLocaleSwitcher,Traiver/FBI,Jerry-Shaw/FBI,Jerry-Shaw/FBI,Jerry-Shaw/FBI,leo60228/CTRM,leo60228/CTRM,Traiver/FBI,masterhou/FBI,hippydave/Newquay,Possum/LumaLocaleSwitcher,hippydave/Newquay