Remove linking to binaries which preserves the initial bug