Revert "fb: to branch mr2"

This reverts commit 3803d76e6758b015e1aa42beb5dd6a49c7688b13.