Rolling back to 0.7