Prepare for the possibility of 1.20.4