Rollbacking the way actions get their model class but preventing bug