revert scala upgrade