This reverts commit 02416877da. Since we landed 3127571b24 - we should revert this one as well.
02416877da
3127571b24