Easily. We just need ID_2 that is calculated like ID but with signature bytes set back to zeros.
Well with all the fuss happening at the moment about this issue I would push for getting this into the next version of the protocol as well as making some guidelines to ensure that the problem won't "creep in" at a later point.
Others?