fc005b8d7c
This reverts commit 869b47338876897d9bc89f5e8fcc9c92ad438218. Reason for revert: Test is fixed. Change-Id: I7f305f428a0f39a09e0d31512e4efa752e39b1bd