Summary: Ended up presenting this version at F8. Reviewed By: jeremydubreil Differential Revision: D15189643 fbshipit-source-id: 332b7c0da