WIP
Eliminate github special case