Screwed up commit before last. This one actually has (most) of the fix.