Not a Berto commit (so beautiful and ingenuous Berto)