JBIDE-15645 : proper fallback on legacy stacks

Signed-off-by: Fred Bricon <fbricon@gmail.com>