Make the non-stripping-of-binaries code work... it was broken.