Revert "Don't use this use self to avoid selfies"

This reverts commit eb2ef20c9a9b27eef089f603c8753fa5ce8415bf.

Change-Id: I1a60634928ce7fd94dac62a7628550499befb994
Merge "Revert "Don't use this use self to avoid selfies""