Get new GVL code working on 1.8.7