This reverts commit 81b0a328. Will Re-apply, with updated Differtial Revision, for automatic closure of Phabricator review.