If Calabria honored the stuff he extolled in 2015 in his Cato Institute sojourn, Fannie would be headed for wind down and liquidation, their entrails spread around to TBTF banks. Be careful what you wish for.
Calabria advocated for a "Fair and Principled" resolution scheme in his White Paper.
Calabria's talk of the fair treatment of stakeholders in an insolvency process in that paper has absolutely nothing to do with how existing FnF shareholders will be treated going forward. Apples and oranges.
I believe Calabria even said that he thinks FnF shareholders should have been wiped out in 2008, though I can't remember where or when so I could be wrong about that.