gdb: Temporarily revert modifications for branch merge