Fix regression in f00aaf8