Revert "workaround #3280"

This reverts commit 031cce4087b8d3b16b9ebd90badf747f4bbc6742.