Revert "Merge branch 'master' into SGA-IT"

This reverts commit b4b54cd24211995c861e4b673224f4d6b932bfb1, reversing
changes made to 24018b4482797b11810db950b08624a6b09ade4e.