Fix regression in 369acba5fe5f457ad193740b5597c2087ef42028