Revert "merged into fb"

This reverts commit 41164057c5a9160f18c12c47f475f42b8bba5adc.