What was the outcome of the hack that caused another 315 million RVN to be added?

With the attackers already transferring their loot to crypto exchanges, Ravencoin says the network has already absorbed the damage from the inflation bug. However, the minting of tokens from thin air will mean an extra 44 days of mining.

The Ravencoin statement also proposed another solution that would involve eliminating the effect of exploit by making the additional 315M RVN part of the 21B total token supply. Such a move would mean shifting the halving dates to occur 44 days earlier.

Which approach was taken? So is the total maximum supply now still 21B, or 21.315B?