Hackish commit to try to stop random test failures.