revert SI issue until build issues are resolved