Revert "Merge pull request #240 from kbase/ip-hotfix"

This reverts commit 96a7a34216e83986cf8d632c4f33cd339563c6f0, reversing
changes made to a82e8d2431c51cb7259386bf04989c756fd04e05.