Revert "Fix #309"

This reverts commit 959caa769295f0d353d35f3b02dbf6e0dab85485.