Revert "DO NOT MERGE Revert "Fix lease duration handling""

This reverts commit 7dd120058972226158176b292c00841efecc259f.
1 file changed