Revert "Switching back to before FB integration to check this still works"

This reverts commit 576d0140a806769c771ff9a76a3e5c2a225c46fe.