This reverts commit 338a83bacc. We first test the previous version of the SAI and make sure it passes all the tests and then update the SAI version to a later one.
338a83bacc