This reverts commit beb0a8ff03.
beb0a8ff03
Doesn't interact well with dialog popups. May add back later with complementing logic.