Revert "fix TS build"

This reverts commit 84a4041ba47e92e7a0ba03938d0ebf88b5fcf6cf.
Revert "Merge branch 'PHP-5.5' into PHP-5.6"

This reverts commit 98e67add15a6b889efe152c23ed15a61f022a63a, reversing
changes made to 2cdc1a2b7473eff27c224c66dcb85118b553a147.
removing the NEWS entry for #41631 as we reverted the fix for now