Revert "krait optimizations"

This reverts commit 19c48fc94045826972c74380b59aa1e47d4723b7.