patch out valgrind automagic
add upstream bug no. fix indentation