o.c.opibuilder: use existing function to check for OPI existence

This is still being debated in #657.
Merge branch 'bug648v2'