Revert "Fixed self references"

This reverts commit 0f4c0663185fb9f2957e23db99d3910acaa47786.