Homestyx hydra

R1:b80ea9e0e85a

Revert cd63d9b2ce26 / D2403, see diff. This broke inline comments by making them not span enough columns.
Repository: R1 hydra
Commit Date: May 7 2012