Revert "Merge pull request #1587 from equalsraf/tb-env-configs"

This reverts commit 53bccaaf99cc9564fe5096d37e9aacfd19e3d2d4, reversing
changes made to 4049002f6b1f6db33a497c1f8473ab15233395d5.