Revert "Fix #519"

This reverts commit 51c90196f907abecb6aef0d3a019fae004885c0d.