...instead of a local function using a static (!) buffer, which just cannot work
in a multi-threaded environment.

Change-Id: Id28e1c55c32aa2e35cd3c1756f5d392241092a30