Revert "start port to g-i"

This reverts commit cd52c34deddc31f231084a3e200f64e4ca9b2850.