Oopse -- fixing last regression-breaking commit.