Revert "Function and session errors fixed"

This reverts commit 16e165f29b662b4947c05dc29d36d0d991614714.