Fix 1.8.x syntax broken while doing #333.