Missed one namespace in the manual merge for a9d00f2.