Revert "preparation p2w1"

This reverts commit b896cea98bd08b0ea5c9b3bef2e2494525b07195.