Bring in fix for #209 from 2.10.x