Revert "TODO FOR TEMA AGAIN"

This reverts commit 6328bea1ffd8cdbe4f46ece2f7b1c96ee02d3c8d.