Revert "Active display [squashed] (2/2)"

This reverts commit 6bc79abd039fb241db1f741968cea41626223522.