Revert "Merge branch 'SGA-IT'"

This reverts commit 3200a5d418ab8b92350a002aab34ec594c95e6db, reversing
changes made to 11a5a2536808f3ecb021a3346d89e6aa78d0cc38.