Revert "Make osi_fetchstore.c protocol independent"