Fixes: 35387665 Test: none This reverts commit b5544d03. Change-Id: I4cf3fa0c65aaee38d0fa9cfea15b72c8ef42acb1