Revert "Peter Pan V2.2"

This reverts commit 7318363298cf98cb808b93bbdad58490db3f5b93.