This reverts commit 2b50f5a4. Forgot to update the description of the commit to sync with phabricator. Going to redo the commit.