Temporary d2 kernel changes.