Nice hack. This is alright to include, although at some point I'd like to
get this fixed on the server side. But I didn't write the server side code
so it might take a while.