Closes #3530, Refs #3474 - Cleanup from #3474 which stopped passing the model into the render template call.