Updated for 1.8.19 and 1.7.22.