Fix logic around use of x buffer ops
The following discussion from !3680 (merged) should be addressed:
-
@al42and started a discussion: (+4 comments) I haven't looked deep into this change, but since it changes the logic, I suggest splitting it into a separate MR.