eliminate old special case handling that was messing with throttling.

add a test.

Change-Id: Iaaaf0f04f02ec54bb83a3fde9fb611e2e6809a4b