Do not export unsafe defaultMakeContext #2