Revert "Merge remote-tracking branch 'origin/bufferedStoring'"

This reverts commit 00d2a0a3994de44408893daad6fef23e483e257b, reversing
changes made to ed507c87d55369bcd7bd39e8da5842706997b0b5.