CB-6818: I want to remove this code, because Square didn't do their headers properly