revert ts fixes

revert ts fixes