Revert wrong JT600 changes