Revert "Merge pull request #2257 from Cobinja/override-redirect"

This reverts commit ecbb7c3d73f2c08fd5777ddce4aaec9fda979d20, reversing
changes made to f2f42191e2498c051e99df43bfe07bdbf7e62124.