Revert "ActiveDisplay: fixes/improvements medley #4,678"

This reverts commit b5647a747eefdfbe440d772491306bf173c3dfe1.