Revert "[1/2] Base: Pimp up ActiveDisplay"

This reverts commit 905abdf9bcd8e9772dff07c2b725557c090e54e3.

Change-Id: I76d510f780e2a4f4d615a5b5fef6f87457ea7cc6