Reverting 2ae25dc (JBPM-3814/BZ 1002724)