#1170 refactoring calls to Request()