Eitan Adler 69a9b7f16b Partial revert of previous commit as some of the changes were not
newbie-friendly.

Requested by:	jhb, gcooper
Approved by:	cperciva (implicit)
MFC after:	3 days
X-MFC-With:	r235209
2012-05-10 12:46:12 +00:00
..