Revert "Update SDK version to 1.8.4"

No match.