JBIDE-16283 - Reverting commit fe2c6ac31622c958236a8c2f69f79854a9d6dace