I thought this was a bug as it just makes a mess of bookmarks. Thanks for posting the fix/workaround.If someone at Mozilla thinks this is a good idea then it should be implemented as an option you can enable, not just applied by default to break ever...