Reverted to the old behavior of encoding the types.