Reverted merge of http://github.com/fhowar/grive