M20180301-0330
This reverts commit e984e7c386d8c3d093251abd2a24df262297d7c1. We are in RC3. No changes are allowed unless critical or blocker. For details see https://www.eclipse.org/eclipse/development/plans/freeze_plan_4_7_3.php. Also, please follow eclipse-dev so that you are aware of the process. Change-Id: If57cc29ac38d0eac420bd9f6bb6874e6be7d7777