Revert "Small one-line change."

This reverts commit 26ff508d73d90f37716942f2ad7cf3ef96e37564.
Merge baikal-GA into baikal-merge-target