Revert "performancecontrol: fix for NPE on boot"

This reverts commit fe9a09ea0e11a2b25f87cd0ace31c27e82b73860.

Change-Id: I67637b6407d72f7946fd50f2849fe9cfac30ee19
Merge "Revert "performancecontrol: fix for NPE on boot"" into jb-mr2