Revert "Fixes #555"

This reverts commit c5d6ffd7e1fdaad00709624d1ba2d0f3b8b3256e.