As discussed, I agree that this is the right change.  We should also look at whether P-CSCFs should even support "bouncing" messages from the core back into the core - this feels like a misconfiguration and it would be more helpful to reject.  I don't feel strongly but probably worth asking Mike.