Revert "references to parameters replaced with methods calls"

This reverts commit 49bcb8db1896b124a5b1973d43a752cc4a636611.