Manually committed this: 7fd449e34fdbbcb1510f7499a0bb8f6adeccbd80

Since this patch is fairly old, I had some trouble applying it with arcanist. It's a fairly small patch, so applying it by hand is quicker than solving all the merge conflicts.

Added some very minor formatting tweaks too.