contrib/opportunity: hack to circumvent #1530