I think all the base requests should work from now on. I need to do some
more testing before merging back though.