Revert part 2.2