Revert "build improvements medley"

This reverts commit 97334be16ce0cae35f12e62f283cac46d144ceee.