Merge "Revert "Making software km implementation both backup and default""