fixes #2121 - this was a merge issue.  Changes to this file allows this functionality to work in master but the changes from this file were not merged into master 2.2.1