Undo fromJSValue

Change-Id: I9975015eaf4db715460be2b82e9c979053f4b7bb