This reverts commits :
  * 7eb1736e
  * 77d39d14
  * 42c516e4
  * a1c5083a

Conflicts:

	master/bt5/vifib_base/bt/revision