Prep for revert 3

Prep for revert 3