Revert "Replace the lock file (and wait file) with pid file."

This reverts commit 0a29f1f1ec92fb9185763a14d27cf30c00faf377.
At this point we do not yet own the lock file.
No need to shrtn.