Revert to 0.6