Fix paths after r329132
This is a direct commit to stable/11 due to svn's handling of merging this move being less than ideal.