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