reverts f7f5e2935818d1bbab7230f2292b253392568fad

Makes AMS usable for me with rails 4.2 and current serializer which have
circular dependences.
https://github.com/rails-api/active_model_serializers/issues/211

Longer term plan is to load all ember data associations asychronously
and then no need to embed associated models.