Revert "Small changes to receiver"

This reverts commit 08366a8b0be3b9b5bdbb6f3e93b02dd0b7371f0c.