Direct commit to stable, file not present in current
Catch up to r332154: Fix d_dev removal of d_type.