Revert "fix wrong variable name" and this->self

This reverts commit 17ffacb32d0f0bc74b22c7ec15343c1989bddefe.