revert to b4cd8d6; applied fix for JBIDE-13926 in wrong branch