Merge pull request #1459 from rubenk/remove-unneccesary-check-for-ip-compat-h