This reverts commit 81f63dbeceb1f111e3d3838e0db084900820f3a3. Change-Id: I3a82c090e9549f0eb5179d74b027a3429ad51517