Revert "Revert "Trying static, although the comment makes me think i should try the opposite of what the code was doing.""

This reverts commit 339dc642bc5a4d84052b37bf2052dddc474716f1.