Revert "JWR bits and pieces"

We are still using this like i said here

http://review.pac-rom.com/#/c/2028/

Change-Id: Ic5355d7fc7082336b4f17688609a47291151454b