revert several changes...ts timeout