Revert "Fix for pushing composite types"

This reverts commit 89f02d9203cebb127aa4404c9cd34283184c3528.