[NUCCORE-1135] Backout to V1.6 to avoid stack map errors.