this reland the commit 4f80fc24 which has been reverted at f805c60a. Fixed windows buildbot failure (by adding -fno-delayed-template-parsing flag).