Revert BND
LPS-46730 Fix when it's not set