Revert "BD16"

This reverts commit ef2235904deeda32074ea65b2b6458a07322ee36.