Add the follow-on bugfix to kernel environment variable leaking