Revert part 2