Jump to 3.x from 2.18 - Next hop fail?

[Robert Blayzor via Bird-users]

I have the following config that works in BIRD 2.18, when I attempted to 
upgrade and run 3.2.1 it exits out on the below. This appears to happen 
with both IBGP and EBGP peers. I'm assuming its because IPv4/IPv6 AFI's 
are on the same transport session... Just trying to figure out the 
correct "fix" here for BIRD3 ...

bird[20990]: rserv1: Missing next hop address



template bgp BH_CLIENT {
    local as MYAS;
    source address MYIP;
    ipv4 {
        import keep filtered on;
        import filter CLIENT_IN;
        export filter CLIENT_OUT;
    };
    ipv6 {
        import keep filtered on;
        import filter CLIENT_IN;
        export filter CLIENT_OUT;
    };
}
#
protocol bgp rserv1 from BH_CLIENT {
    neighbor 2000:f000:1::10 as MYAS;
    source address MYIP6;
    ipv4 {
        import none;
        export none;
    };
    ipv6 {
        import none;
        export none;
    };
}