Reverting r204952, while I figure out what's going on with the makefile build.