This reverts commit 5ad13e0c. Reason for revert: Test case has been fixed Change-Id: Id05757c494628c1d84943b383cf7639098a3fa3a