Fixes up commit 3e58132f
@mlaurent, if that was a scripted commit, please check for mistakes everywhere else you did that.