Revert "Merge branch 'AI-132_si-legends'"

This reverts commit 4195a98c015f166272317386c66035f3fcbdb778, reversing
changes made to 580f84f73cea1b23b160e192e1ec52f92826f6b7.