keep them in, I'll see if habitat with the s3 pull request still screws up. If so, I'll file it for Brian.