Reverting the revert of the revert to revert