Revert r256944, which does not quite get the src/ directory correct.

Discussed with:	cperciva
Approved by:	re (implicit)
Pointyhat:	gjb