This commit passed buildable tests in phabricator, but fails once committed. This reverts commit 1dedc96d.