Revert "Add an double check in value"

Need some fresh air...

This reverts commit c96bcd63f64d072d92bf4583342115007736dfbb.