Back to pre-release for m-buffer.