Revert "Brock's FB Changes (squashed 3 commits)"

This reverts commit 0b15f77610194ce15868f33e8c35c721734c7dbc.