Revert to_marshallable_type() change as advised by @skimbrel.