When was 60s decided on for a safe shutdown? How many installations are now much bigger than was then normal?
Ideally this 60s wait should be more of a closed-loop wait, with a limit. It sounds like the limit should be higher, if there are now many instances out there which are now vulnerable.