patching PR #118 due to some issues when building thru yogi
Revert PR #120  and PR #118 due to issues when using shifter thru yogi

This reverts commit 930273f8e0f1b6ff5a1c3d3364d0ac97af9d4402, reversing
changes made to 4199a123678076393466b347b7137052d84d2598.