Use S10 as the id type and rever the changes
Fix the canonical test