Summary:
D18169584 introduced state error which I didn't notice. This diff reverted the diff.
`hg backout D18169584`
Original commit changeset: 77a8b034c5e4
Reviewed By: jknoxville
Differential Revision: D18203354
fbshipit-source-id: 3e281f1e8c7e1d2bf41665adfa5ce5f13daca3a1