Revert "Possible fix for #1628"

This reverts commit a6e22de6a3d58fd5b848a2b211f1b7bbc5778a6b.