Done, see https://phabricator.haskell.org/D2518