This reverts commit ea044049. Reason for revert: The test should be fixed Change-Id: I3bd2f39f8cec947856af09e96b60234c0c25cb1c