This reverts commit a051319b34. Added a FIXME note to `defined_type_object.rb` that explains why this patch was originally created, why it was reverted and what unresolved issues remain.
a051319b34