Switch back to upstream org2blog and update