[2.5] Possible
Revert "[2.5] Possible"

This reverts commit 0dbeeb836e1aa3721d8cca12f55425b5ac5934b1.
[2.5] Possible "p1" bug fix