Revert "Use format instead of type property for Content deserialization"

Using format caused problems because Jackson does not support multiple
type names being mapped to a single class.

This reverts commit 96b0cf42.