This reverts commit ab303e6440. Reason for revert: Moved out to future release Change-Id: I36b046c8681371baa9e0ccb69d46dad633ee5706
ab303e6440