Revert "First cut at merging sweeps"

This reverts commit 1320cdab19b48085139a0f6eb0a6067d9a1076e1.

Conflicts:
	src/backend/storage/buffer/bufmgr.c