Fix removal of hiera('environment')