We don't really need the old_style_hash argument anymore.