That actually looks wrong. Was there a reason to drop `substr`? /cc @brettp