Revert changes for jwr kernel [1/2]

Didn't do my research...

Change-Id: I36a29bd6b89dda15f0ae8160f878c8159fb7b40f