Code review comment for lp:~gary/launchpad/bug723999-2b

Looks good. I did a little processing of the diff so I could prove to myself that all the code that was removed was put back and that no changes were introduced in the process. Everything made the trip unscathed.