backing out to 1.0.7