This reverts commit be1d78b0dc899a732c0e9d7515d3023e8004e368 Change-Id: I11a95db474796f3da004f27652b081d5ba4ec9b4
There were two bugs in our implementation. Intel found one, but another remainined, and tracking upstream is the way forward for functions where we add no value. Change-Id: Ida9bac0293fb2c4cbc942b1e0515ee0477c6538b