Hammering v1 -> v2 support in with a sledgehammer.