Rollback unnecessary string key conversions