completed transition back to 0.8.x