Revert changes for jwr kernel [2/2]

Change-Id: I9f6a17be4375435718c17ad84958e380cbc94a6a