Revert moving code to value.h