kill compile warnings
back out some changes - forget the useless node API
Merge branch 'master' into streaming_file_api