Revert "Merge branch 'bib'"

This reverts commit d471fd0c4175156bbdd22c2dde0cc96767a8a1ce, reversing
changes made to de53de46a3ed9864ea912c654aa183fa721f8e3d.