some changes revert

due to new buggy typescript 0.9.0.0 release