Yes. We don't really have a choice here. Again I went from 1315 to 1 :'( , loosing all buffs.
As for debugging, I am playing on a local dedicated server. Also, the bloodthirsty blade didn't loose its charges (it is caped though).
Edit: tried on a single player world, charges are adding just fine !