Bring in fix from 2.10.x for #206