r5208: pull one last change from 3.0