Revert "patch for iss300"

This reverts commit defbf1f624b34645926a773d9486b2856a1aad2e.

See discussion on #308 for more info.