Revert "Fix for #347"

This reverts commit dd80ddd6f95d7f659929a49d3bff62492692c4fa.