Remove EBI reference lookup. (for now)