We dropped the patch in 1.16.1 update due to it being a major conflict. This restores it. Co-Authored-By: Aikar <aikar@aikar.co>