Simplify bypass-cache-for-scalar-ops.patch