Revert "Fixed bad merge."
Revert "Fixed bad merge."

This reverts commit 16b84c0ce760547700aec8a239fff95c77cfddb9.

ngzax/urbit,belisarius222/arvo,jfranklin9000/urbit,jfranklin9000/urbit,ngzax/urbit,ohAitch/arvo,urbit/urbit,jfranklin9000/urbit,urbit/urbit,ohAitch/arvo,joemfb/arvo,ngzax/urbit,urbit/urbit,urbit/urbit,ngzax/urbit,Fang-/arvo,ngzax/urbit,jfranklin9000/urbit,jfranklin9000/urbit,cgyarvin/arvo,ngzax/urbit,urbit/urbit,joemfb/arvo,jfranklin9000/urbit,urbit/urbit,belisarius222/arvo,urbit/urbit,jfranklin9000/urbit,cgyarvin/arvo,ngzax/urbit