Revert "G3.1.1"

This reverts commit b6eef8f184233da852053553184f26c09dc778c9.