Regression fix for smoke tests.