Undo GDBRegistrar patch fixed in 3.5.