Revert "Merge in functionality from transforms branch."

This reverts commit 600df6755b9ca0071455e5850834532f97c487b1.