Revert "Merge pull request #1305 from vogdb/issue-1305"

This reverts commit 126afb871f7b063cdf75fc9e31f5e84a72570ead, reversing
changes made to ff7048a9f201e3520983c40ed2b632f2ccb3731d.