Revert "When both value and originalValue are null, a proper check is done."

This reverts commit 70901a20c894f2d31804b9b6b6493842307a18d8.