Revert r74117. Breaks the test. Using an internal request it doesn't fail with NeedTo...