Revert "TM-122"

This reverts commit f5fbcf99ea676f68e95836977b5e5c368654022d.