FIX: Modified fix for #2389 to ensure existing tests pass.