XD-625: Revert XD-624

Custom connection factory is not needed anymore, neither is the deserializer.