Revert "fixing merge issue"

This reverts commit 7db0db0e2af3c4cc59de31d7d63307578cdfbe55.
Merge remote-tracking branch 'origin/master' into kvnkeith