Intended change in functionality here? And wouldn't the default value `null` that's being passed here immediately cause an NPE?