Changed #4277 behavior