Revert "gio: cleanup"

This reverts commit a1eb49326180ade8d8fcf9f931868ed6088bede9.