Revert "Fixes #782"

This reverts commit ac7d1ef53171bae048df6bab2bf9e771a51d2d17.