Revert "Attempt to avoid exception seen on jenkins"

This reverts commit 64f1ce98165dc1bdcc4145558fea96a2a1d8343c.
A better attempt at fixing the jenkins error