Revert "added buffer return"

This reverts commit 9098fbfdc6332708d27777a76902a146bc8b67df.