Backed out changeset 99c34e47348b

The change broke test_gdb.
2 files changed