Change Details

Note: This is just a first step that I've distilled from a larger patch set I'm working on, but is a good interim fix.