rolling back change in changeset 1277 for default osrf_clearbuf handling. not sure...