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

This reverts commit 3fa1d2595eb06c90db1be0425527fa4942947b27.