Revert "Try again"

This reverts commit 5bae943c0549d8fa7408888fe088518458f06331.
Fix globalcontext error