Bug 886299 - Remove the wallpaper fix and replace with something more resiliant; r=gbrown