Revert "fix from @mjhca added"

This reverts commit cebb068dab8cf82c8ef1f81b0d9d464903aada49.