@@ -382,10 +382,6 @@ VOID WINAPI SHGetSetSettings(LPSHELLSTATE lpss, DWORD dwMask, BOOL bSet)
                 SHELL32_GetDefaultShellState(gpss);
                 read = 0; // The advanced items we read are no longer valid in gpss
                 g_CachedSSF = SSF_STRUCTONLY;
-                /* HACKFIX: This should not be needed. Defaults should be used
-                 * until an override option is selected. See CORE-20585. */
-                rss.ss = *gpss;
-                SHELL32_WriteRegShellState(&rss);
             }
         }
         SHGSS_GetSetStruct(SHGSS_GetField); // Copy requested items from gpss to output
Original file line number	Diff line number	Diff line change
`@@ -382,10 +382,6 @@ VOID WINAPI SHGetSetSettings(LPSHELLSTATE lpss, DWORD dwMask, BOOL bSet)`
`382`	`382`	`SHELL32_GetDefaultShellState(gpss);`
`383`	`383`	`read = 0; // The advanced items we read are no longer valid in gpss`
`384`	`384`	`g_CachedSSF = SSF_STRUCTONLY;`
`385`		`- /* HACKFIX: This should not be needed. Defaults should be used`
`386`		`- * until an override option is selected. See CORE-20585. */`
`387`		`- rss.ss = *gpss;`
`388`		`- SHELL32_WriteRegShellState(&rss);`
`389`	`385`	`}`
`390`	`386`	`}`
`391`	`387`	`SHGSS_GetSetStruct(SHGSS_GetField); // Copy requested items from gpss to output`