Revert "Refactor generateModel"

This reverts commit 451aed21cabbd959db74906a145362a08b97ecac.

Change-Id: I3f8d62ab28fbecebba0aca20d6f73a6b755b36ce
1 file changed