Revert to 6.0.0-SNAPSHOT