Revert "Rework Active Display Again (2/2)"

This reverts commit 2112940625155ee5bbd2d21967de4e1d91980935.