Reverting collateral edit from #366.