Instead of assuming that the property is visible via the object
hierarchy, it's best to explicitly pass it around as a property to
ensure that it will always be available when queried for.


(cherry picked from commit 01f3b8b3)