Revert "refactoring to CompositeWeaverBuilder"

This reverts commit 44824a7269830d7cf6fa6c3e4f840138c99326d8.