Revert "fix for #1019"

This reverts commit 3e58f8d39ce7ddcdfad3a90ea96016c6af96ca9e.