am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling""

* commit '41b35884ff68a62f5fc8f65dcc26342d0889113d':
  Revert "DO NOT MERGE Revert "Fix lease duration handling""