This was done by adding two more properties which allow specifying the
wall-clock tolerance. If those properties aren't set then the old
behavior is retained.