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

This reverts commit 0f6895cba35b5676f2918033bd22ac1583ff9e30.