Revert "merged in latest oss build template"

This reverts commit d30f42a6561fcd67a0e7b3cb85907ec4114979eb.