Removed last commit
imported patch hklmcleanup.diff