Fix js syntax resulting from merging upstream