This reverts commit ac9d5cd7. Reason for revert: Fixed test Change-Id: I01efe527b6e9c2adf3bec354faf9e9dde586cc17