Revert "Merge pull request #22001 from mikehenrty/bug-1038988-wallpaper-flatten"

This reverts commit 8abddb42a444dd165332e6642133932a04020b50, reversing
changes made to 90bb50d59cffda27e1bf035c9590a5f3062e4832.