Some strange issues on angler. This reverts commit cda9386a. Change-Id: Iba3a8bac6ce40ee16d83163823356951fecb6787