Sometimes we explicit need to lookup by number and not numberOrID (cherry picked from commit e2849bf19d)
e2849bf19d