This reverts commit e4e21193.

The IDBProperties test shows that this special case is not needed to
for these types to be marshalled correctly.