JBIDE-15068: second attempt