Revert "Embedded transformations"

This reverts commit 8c10c2e6070c4cadf391808fe9a679bed95e4249.