Reinstate the hacky default environment thing for the moment