Use submodule from @asaunier's fork