Revert "Potential fix for #304"

This reverts commit 9022097fcbdb5b5e727d09bf44ceaac1adcdd315.