Merge "Remove dead code related to using a non-local FIFO for message passing."