This was missing in commit 4c2120c and produced some build failures that were hard to analyse. I'm not convinced that the underlying problem is solved, but this does at least restore the build.