hplip: revert 2 previous commits; the error was in bootstrap.