Revert "rebase gee on mako"

This reverts commit 6124472add6de2ed62cdefd870929eee51950eb6.