Revert "Update core to 7.24"

This reverts commit 1a62815c0ef7c7255d43822731fded642782a0d9.