Revert "Switching back to 8 for now."

This reverts commit 526a2dd8dcab6dc40509cf641ce9729529b75373.