revert latest change, fix stalled handling in Relay.pm