Yes. The clock starting at filing change was due to submarine patents (people would keep things in process for many years, and slowly amend them, until when they finally issued, they covered whatever was cool at the time. There are a few famous examples).

Realistically, the life of the average patent was not extended by this change, since patent apps, on average, were taking three years to approve.