Revert "GI2"

This reverts commit c405e5865e4212a65faea71a38667d75cf7e40d3.
hz