Bring back Krait optimizations