This reverts commit 0895052c01. Reason for revert: issue 6387 Change-Id: I14e00addeab53606952aa3ea2d45a74eac7a9d8a
0895052c01