Temporary fix to recover smoke test