Update to Core#642e0cc.