Revert "instrument q.next and q.drain"

This reverts commit 22d357f5d09eac12f7ed112ecf143bb7d18a1023.