Revert: Update 6.0 to 6.0-HF01-SNAPSHOT