Revert "Before I set any finger on this: make it readable."

This reverts commit 49504411f0c07dfa321187d495c248018f7db4f9.