Revert "Fix after theme chooser"

This reverts commit 91be957204da843744522adf9a0ffad04cd8ca7b.

Change-Id: I36ea44e4811c17933b0963e4f7c5c653d854eee6
Merge "Revert "Fix after theme chooser"" into 4.4