Summary: This reverts commit 983216cb697840fce59af80ffc143353b8e1473d. Reviewed By: jvillard Differential Revision: D23706950 fbshipit-source-id: 9b1cf9e64