Revert not tested .valueOf edge case