Revert "enrc2b: no idea how this managed to get back in"

This reverts commit 76ee2206746f6a88aeddbd2e5386de0d2abd39cc.

Change-Id: I60450c312fd9a838c3fdf2dd9aa513cf4dbfa6f2
Merge "Revert "enrc2b: no idea how this managed to get back in"" into cm-11.0