Revert "Active Display fix"

This reverts commit 5fd3c70cae1f8621edbe3e0a5214d337593453e0.