rolling back core fix

Change-Id: I1bb0c7168f9d5b086a82aa88feddba143d3a5dae