Fixes #12063. This is a complement to #11870. Removed the "Folder" registry keys, restored the "directory" ones and added the "Drive" ones.