=rem #3646: Workaround for 3646 to not break protocol compatbility

(Properly fixed in 2.3)