Revert "Merge pull request #422 from marclove/reduce-serializer-code-complexity"

This reverts commit 449849516bf640986445d5318cd8c1f62ed88dab, reversing
changes made to e103569c223963feef0f6618011e68dfac112db7.

Conflicts:
	lib/active_model/serializer.rb