Bring in current haddock changes, still broken
Use patched haddock