EZP-22564: removed todo; gateway is fine