WiP fix for lockfile race condition.