Revert "Improvements to model serialization"

This reverts commit 9b5ad47eec620686424aad8b4c09486b2add6e93.