Revert "fix build"

This reverts commit 2cc256ad3afc166f4bb8704a33bd14799449b50d.
Revert "fix derp"

This reverts commit a74a760577d7c68f8d69a600c19b81c04f966b8e.
Revert "[1/2] Base: ActiveDisplay (rework interface)"

This reverts commit 5e5f2fa7533de4da9e0985c3b2f4aeb341f0f5c2.