Revert "TAAS rikki"

This reverts commit 10fce7702ddc4fbdb5d024de5d53c31dacdc9a43.