Merge pull request #289 from framework-one/revert-286-develop

Revert "Adding logic to support function expressions for the onLoad list...
Merge pull request #291 from framework-one/develop

Merge pull request #289 from framework-one/revert-286-develop