Revert 2d51a97..4393868

This rolls back to commit 2d51a9782f903a7df2f52cb100129ba9480a69bd.
Serializer with model