Pulling buildfile back to 0.6.0