Also, the logic doesn't actually need to be removed, just moved, since mapreduce doesn't call any of this for HTTP.