Revert "bp/123456"

This reverts commit 210122d26de16a0cf2cbdb4ac9074eb97b726dc1.