Commit 2cecc38c7cf49b2cf697efa7e974ceee7055f2c5

Behdad Esfahbod 2015-01-29T13:32:05

[layout] Shuffle code around