This reverts commit d7ccc25142. THe change broke builds of `gdb` and `linuxPackages_latest.systemtap`.
d7ccc25142