Fixed issue lingering after 4.0 code removal.