diff --git a/src/lib/Hydra/Component/ToJSON.pm b/src/lib/Hydra/Component/ToJSON.pm
index 469af78b..ed8d59d9 100644
--- a/src/lib/Hydra/Component/ToJSON.pm
+++ b/src/lib/Hydra/Component/ToJSON.pm
@@ -9,58 +9,25 @@ use base 'DBIx::Class';
 sub TO_JSON {
     my $self = shift;
 
-    if ($self->can("json_hint")) {
-        my $hint = $self->json_hint;
+    my $hint = $self->json_hint;
 
-        my %json = ();
+    my %json = ();
 
-        foreach my $column (@{$hint->{columns}}) {
-            $json{$column} = $self->get_column($column);
-        }
-
-        foreach my $relname (keys %{$hint->{relations}}) {
-            my $key = $hint->{relations}->{$relname};
-            $json{$relname} = [ map { $_->$key } $self->$relname ];
-        }
-
-        foreach my $relname (keys %{$hint->{eager_relations}}) {
-            my $key = $hint->{eager_relations}->{$relname};
-            $json{$relname} = { map { $_->$key => $_ } $self->$relname };
-        }
-
-        return \%json;
-    } else {
-        my $json = { $self->get_columns };
-        my $rs = $self->result_source;
-        my @relnames = $rs->relationships;
-        RELLOOP: foreach my $relname (@relnames) {
-            my $relinfo = $rs->relationship_info($relname);
-            next unless defined $relinfo->{attrs}->{accessor};
-            my $accessor = $relinfo->{attrs}->{accessor};
-            if ($accessor eq "single" and exists $self->{_relationship_data}{$relname}) {
-                $json->{$relname} = $self->$relname;
-            } else {
-                unless (defined $self->{related_resultsets}{$relname}) {
-                    my $cond = $relinfo->{cond};
-                    if (ref $cond eq 'HASH') {
-                        foreach my $k (keys %{$cond}) {
-                            my $v = $cond->{$k};
-                            $v =~ s/^self\.//;
-                            next RELLOOP unless $self->has_column_loaded($v);
-                        }
-                    } #!!! TODO: Handle ARRAY conditions
-                }
-                if (defined $self->related_resultset($relname)->get_cache) {
-                    if ($accessor eq "multi") {
-                        $json->{$relname} = [ $self->$relname ];
-                    } else {
-                        $json->{$relname} = $self->$relname;
-                    }
-                }
-            }
-        }
-        return $json;
+    foreach my $column (@{$hint->{columns}}) {
+        $json{$column} = $self->get_column($column);
     }
+
+    foreach my $relname (keys %{$hint->{relations}}) {
+        my $key = $hint->{relations}->{$relname};
+        $json{$relname} = [ map { $_->$key } $self->$relname ];
+    }
+
+    foreach my $relname (keys %{$hint->{eager_relations}}) {
+        my $key = $hint->{eager_relations}->{$relname};
+        $json{$relname} = { map { $_->$key => $_ } $self->$relname };
+    }
+
+    return \%json;
 }
 
 1;