[BACKLOG-1619] - reverting changes that passed annotations into the auto...

... model strategy.  We will instead apply the annotations outside of automodeling.