We should try and stick to gson wherever possible. A another PR to fix this is fine.