Removed special case handling.