there's still a bug for the environment, but that's worked around in
this change as well