Revert "Base: Fix for the race in Wallpaperservice"

This reverts commit 6d935a98531c8eb0b9ef680539fb8b35ae5c4391.