This probably also has to be reverted to the MongoDB specific types for now.