Revert master target v3.0