Revert "Merge pull request #420 from msabramo/increase_coverage"

This was merged by mistake.  It can't be merged into the Supervisor 3.x
branch as-is because that version of Supervisor still supports Python 2.5
and this change includes code that is not compatible with 2.5.

This reverts commit bff127eb7009ada86d0b08d5e358bf459f8be24d, reversing
changes made to e3fe37edf4188263a984881313fe263d0313bc5d.