Revert removing ruby name from the search string for binary rubies, update #2608

This reverts commit 45ae5a2377c8f7146226ebbab52d618fdb74db1a.