Revert "build setup change"

This reverts commit cace64dbce322e4d9e486e637952cadf72ab0fd2.