Merge r56715 from wmf-deployment (Moved unbuffered-ness to below count query to fix...