Revert "Backport fix #184"
Merge pull request #293 from rcbops/revert-292-backport-fix-184

Revert "Backport fix #184"