This reverts commit 18c31d7f. 63615066 fixed the bug. Change-Id: I1d59c4be6ad1a05b23dce0198737f0789d7e034a