Roll back to 0.5.0