conditionnal require
Remove hack around docker bug, upstream has been fixed