[master] No need to hack substring search