DO NOT MERGE Revert "Fix lease duration handling"

This reverts commit 56878760c3f0255dbcc8d78572f784b96ee36cb0.
1 file changed