Revert "env: solve compilation error in SPL"

This reverts commit 7d477654.  The
changes here break environment validation and furthermore do not seem to
be required.

Signed-off-by: Tom Rini <trini@konsulko.com>