This change was idiotic as last years way was a mistake which was fixed this year, until it was un-fixed This reverts commit 2ec421fbde.
2ec421fbde