Roll back to 0.2.x working code.