revert to chikdar 0.7.1