Commit 8474231567a08873cc5e0aa08fea60316a04c27e

Behdad Esfahbod 2016-02-11T16:27:41

[ot] Minor shuffling code around