OK, let's roll as-is then and get this in to 1.6.2-incubating ;-)