Done it myself now (it broke the ROOT build) in commit 9c79a9a