[s-j] Use upstream-released 1.2.5