Fix infinite opt loop

This should enable the buildbot to run again.