Reverts commits not in 0.7.0 version