Revert "Update 8.1"

This reverts commit 58a17fc079199300f4b5c0a2655b5bf94eea6984.r

Change-Id: I0719d4ebad04aab317d1835dd58f70c9854ab7b1