Back out some parts of the previous commit. While "technicalist excellence"
might be something cool, eternal values such as obviousness and readability
should not be sacrificed in its sake.

Discussed with: pav