Revert "Respect aliased tables on cloning the gateway"

This reverts commit 0d77c297c3b79b0909669f41f5595997419b7d28.