Reverted unnecessary change that broke the Model.definition decorator