Revert "B1.13"

This reverts commit 125003c09e6efb7852edb304440a943dc7e3c29d.