First attempt at fixing failures which do not happen locally, but only
on bamboo