Revert "Adding a bit of buffer"

This reverts commit 08c299a00442598850c52b8af70cc35bf688899c.