You dont have to do full flash, just flash Main and any patch disappears. Patches dont touch FS, only Main.

Patches work for a specific version