Revert "Fix some z-index issues"

This reverts commit 2938400c5b68f6d2c10b74aa59f65a08678244cc.