Move back to using automatic lookups.