Revert "Properly cleaning up the display tabs"

Produces a segfault on Arch Linux using Clang. Remove for sake of
release.

This reverts commit 706bc28ff536f4f53fdf6e24178b9e3bac67d53f.