The recent Nehemiah changes introduced lots of stuff that does
a whole lot of nothing. Nuke it.
Signed-off-by: Dave Jones <davej@redhat.com>