Add temporary patch to work around immediately hung problem.