Restore support for GHC-7.6.3