Two-year wait to buy leasehold to be scrapped within weeks