Revert "Bump to 6.0 final"

This reverts commit 22dbbb9fe570f2cd846223cacc361c6807a4da96.

Change-Id: I4823454b0c574c8a66b932250ba03e2e3cfc81a1