Static dependancy to orchestrator 

Prevent a bug that appeared somewhere between orchestrator 0.3.3 and 0.3.5.

This fork is temporary.