at least 2.5 is fixing this with a "are you sure?" box
but to do both would be awesome too