Work around bug in orno/di