Reinstate workaround for GHC bug #7170

Closes #26