The change this commit is reverting causes glitching with smaller
buffers for some reason. More investigation into this is required.