More generix fix for #1403.

Makes #1404 redundant
Revert "Fixed #1403"

This reverts commit 74cb9c3284d5312c8c325fee461af187f9c480f5.