Probably want to just put this back into the superenv block and remove the conditional.