Revert "fix for #2263"

This reverts commit 3b38a92930f4b54db5a63debf8f6904e5396143c.