Revert "Merge branch 'feature/env-ip' into mine"

This reverts commit a18d93de3708a9fbba189ed6c7c3c9e926b29f9d, reversing
changes made to 6fe5e7cc808d5f30bff1524f5e4faa5ef6167182.