* (bug 2620) Return to prior behavior for some more things (such as