Fixed gfm import semantics to match gfm master