This reverts commit 296fdfb7.

Conflicts:

	master/bt5/vifib_base/bt/revision
	master/bt5/vifib_slap/bt/revision