Revert "Rework Active Display Again"

This reverts commit b54a8f45296c52055a9b6dd3c3ec91fa5627d5c7.