fixed regression bug I reintroduced during a rebase merge
removed out-of-date comment