Another fix for the r22 update.