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

This reverts commit 183ea5dd1c98930507fe0e3a6b88be35f88c161b.