Revert changes done for JRE feature