Removing peek behavior, error recovery for empty requests is good enough now.