[Temporary] Revert to pull-request commit.
Revert "Wrong variable name fixed." (next commits moved to project-tests branch)

This reverts commit e6b376b95b3eb3c32ab6591e4be5aec036985253.