Revert "Apply 3f6c105 to ja tree"

This reverts commit 58bda0182d5276c975a249047e0efbda7103ae07.