Disable new manual gateway as well.  See #1701