Incremental patch to apply after the patches in ticket #211