Revert changes for JRE feature