Remove the incorrect SAI and move it to cpp (cherry picked from commit 482e0dad30ccb88ae4d518fc205f1cd76202fed7)