Revert "Attempt to un-break the gdb buildbot."

This reverts commit 180982.