Revert "krait optimizations"

This reverts commit c9ffe543dc148aa540e4e8300c50ff9d6fc1ff0c.