Revert "Update for Habari 0.10 master".

Master is still for 0.9, use the 0.10 branch. This reverts commit 4463e7d29b085c92a9dd1a5c8da90413584f2a78.