The fix for WSI-70 was causing issues so I've removed it.

This is to fix issue #69