Similarly as the parent commit(s):
- remove hardcoding to specific numerology
- avoid conversion when we don't need it