Revert "6.5"

This reverts commit 393a06b49fabb80ae5a6b1f36edb2fd57a807eaa.