Revert "Merge pull request #1758 from dan-t/master"

This reverts commit 3c7a740847e987c0c11750cab97c2859cb43cc27, reversing
changes made to 68d9077c5f091200f87308e032e7c05ff5ea250d.
Revert "-Wall police"

This reverts commit 68d9077c5f091200f87308e032e7c05ff5ea250d.
Revert "Merge branch 'master' of https://github.com/dan-t/cabal"

This reverts commit 0038d05a9d5af1daeae2e160da69f946760813e8, reversing
changes made to c721e85137b4afb7fe879ef365f368d7a23ec43a.
Rename that function again.