Revert "Fixes #368"

This reverts commit a61599b22debcd2a3930d2e767f722908c734f0a.