issue #5
#11 (cherry picked from commit 4d5d3dcaf2)
4d5d3dcaf2
This reverts commit 4d5d3dcaf2.
#11
resolves #4