Revert "Merge pull request #117 from gem/gemecd2-improved-models"

This reverts commit 0ba9daf2bf2437143f0caedd4e85e33556e7a5e3, reversing
changes made to a6c69407fa27ace417eae7bf4bd085310d548db9.