Revert "Fixed: Some devicevalue fields fixed."

This reverts commit c272bf6f6197aad3b740544b8f98d172d32f6bb7.