Revert "Updated to 0.7 branch"

This reverts commit fa7bd0386cedb3867714b26d48391fe9660e390c.