MODE-2294: Prevent unnecessary serialization