Revert "Update to upstream 1.6"
    
    I previously accidentally pushed into the repo instead of into my fork
    and then realized there are some blockers I need to solve first
    (there will probably be a 2.x release upstream).
    
    No need to use epoch since the 1.6 hasn't been built.