Revert e07b6b4..1d34bcd

This rolls back to commit e07b6b4c319824a071c368fdd09ebaf5a23b8d0f.
save before TNT test