Revert 8073b45..eb715da

This rolls back to commit 8073b45d9267c7d09914d7bde80123ffcdf4311d.
TNT experiments