Revert "Fixes #476"

This reverts commit 1ac05e9ce08c7ba059bbb5dc9c44c407161834c3.