Revert "Fix for este.Model.toJson"

This reverts commit 4b74f6bd9a1ffb561882c4a00c37f41c39d29b97.