Fix for CB-2284. 401s are appearing when we hit them