Revert "2.2.4.0"

This reverts commit 75b5d31943d5eac991be0c01768027f8c19cde6e.