Revert 508cc76..5092fef

This rolls back to commit 508cc760fde60efc9514813c3c71b9592104133b.
no longer sending facility id

asdf