Removes "guessing" behavior from enhanced RR client.

Tests are passing.