Revert 79bfd05..7ab23a4

This rolls back to commit 79bfd056690847254e10bdc63fc69bcaac647db9.
Finalized code for Teradata