Somehow the ENV directive doesn't work in all cases (?) and I got a template error when upgrading.
mentioned in commit 01baf3c7