Revert the J handling change