Reverting it to the old way. 

Kind of looks like that may have been a mismerge (or, I guess an unneeded fix of a not-mismerge).