I'm 100% for this, it would make life much easier for everyone. Too often does an incident occur that could have been avoidable if the rule made more sense, and wasn't so open to public discretion. It needs to be more specific or changed entirely in my opinion.
P.S. Also clear up the whole 'claim at 2 minutes'