Revert "TDQ-9813: fixed the build problem and classpath."

This reverts commit dd51e2a8549abc3df2def0ee9daa183e5aef281d.

This reverts commit b140f713e12e87cb873953e8acb710a0998736d1.