Oops, better restrict 2.x case to <3.0