Revert two commits; premature merge from branch unreceive_behavior.

This reverts commit b3344c5c627582a8f89056467461e7027e63008d.
This reverts commit e00c2d160d707cbc4ba9764e3a5a21337553ac32.