Reverting 7073362 (JBPM-3814/BZ 1002724)