Revert "flx-ido does not exist but flx does"

This reverts commit 6821b1d79b13201fd467990016b92e09fa4f7ddf.
Merge remote-tracking branch 'refs/remotes/upstream/master'