Revert keep predict and stage_predict seraparted between classification and regression