Revert 4649d08..7c079fe

This rolls back to commit 4649d08617e6bda4cd27efbb364bfc3fbc6b662e.
temporary fixing geInstance issue