Some strange issues on angler. This reverts commit cda9386a. (cherry picked from commit 8e2478d2) Change-Id: Iffd25c5fb732ff72b58c787c107dc33c56f8c8d4